From e528819d0076bebb9f797a56c745c3b1c23706a2 Mon Sep 17 00:00:00 2001
From: Rico Tzschichholz <ricotz@ubuntu.com>
Date: Mon, 24 Oct 2016 10:31:37 +0200
Subject: [PATCH] gdk: Remove deprecated gdk_add_option_entries_libgtk_only and
 gdk_pre_parse_libgtk_only

---
 docs/reference/gdk/gdk4-sections.txt |  2 --
 gdk/gdk.c                            | 31 ----------------------------
 gdk/gdkmain.h                        |  4 ----
 3 files changed, 37 deletions(-)

diff --git a/docs/reference/gdk/gdk4-sections.txt b/docs/reference/gdk/gdk4-sections.txt
index 10629d08a6..fa1f6e78de 100644
--- a/docs/reference/gdk/gdk4-sections.txt
+++ b/docs/reference/gdk/gdk4-sections.txt
@@ -91,8 +91,6 @@ gdk_window_type_get_type
 gdk_window_type_hint_get_type
 gdk_wm_decoration_get_type
 gdk_wm_function_get_type
-gdk_add_option_entries_libgtk_only
-gdk_pre_parse_libgtk_only
 </SECTION>
 
 <SECTION>
diff --git a/gdk/gdk.c b/gdk/gdk.c
index 46cd9c5a5c..ae6ffebe73 100644
--- a/gdk/gdk.c
+++ b/gdk/gdk.c
@@ -255,22 +255,6 @@ gdk_add_option_entries (GOptionGroup *group)
   g_option_group_add_entries (group, gdk_args);
 }
 
-/**
- * gdk_add_option_entries_libgtk_only:
- * @group: An option group.
- *
- * Appends gdk option entries to the passed in option group. This is
- * not public API and must not be used by applications.
- *
- * Deprecated: 3.16: This symbol was never meant to be used outside
- *   of GTK+
- */
-void
-gdk_add_option_entries_libgtk_only (GOptionGroup *group)
-{
-  gdk_add_option_entries (group);
-}
-
 static gpointer
 register_resources (gpointer dummy G_GNUC_UNUSED)
 {
@@ -339,21 +323,6 @@ gdk_pre_parse (void)
     }
 }
 
-/**
- * gdk_pre_parse_libgtk_only:
- *
- * Prepare for parsing command line arguments for GDK. This is not
- * public API and should not be used in application code.
- *
- * Deprecated: 3.16: This symbol was never meant to be used outside
- *   of GTK+
- */
-void
-gdk_pre_parse_libgtk_only (void)
-{
-  gdk_pre_parse ();
-}
-  
 /**
  * gdk_parse_args:
  * @argc: the number of command line arguments.
diff --git a/gdk/gdkmain.h b/gdk/gdkmain.h
index e39dc4aed0..2e1061dd99 100644
--- a/gdk/gdkmain.h
+++ b/gdk/gdkmain.h
@@ -49,10 +49,6 @@ void                  gdk_init                            (gint           *argc,
 GDK_AVAILABLE_IN_ALL
 gboolean              gdk_init_check                      (gint           *argc,
                                                            gchar        ***argv);
-GDK_DEPRECATED_IN_3_16
-void                  gdk_add_option_entries_libgtk_only  (GOptionGroup   *group);
-GDK_DEPRECATED_IN_3_16
-void                  gdk_pre_parse_libgtk_only           (void);
 
 GDK_AVAILABLE_IN_ALL
 const gchar *         gdk_get_program_class               (void);
-- 
2.30.2